From: Colin Walters <walters@verbum.org>
Date: Tue, 1 Nov 2022 20:22:45 +0000 (-0400)
Subject: deploy: Use `semodule --refresh` if available
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2~2^2~30^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=f0c3d09618edc4950a3f06af4f829525ba6b840f;p=ostree.git

deploy: Use `semodule --refresh` if available

Current FCOS emits a warning:

```
[root@cosa-devsh ~]# journalctl -b -1 -u ostree-finalize-staged --grep=deprecated
Nov 01 20:21:21 cosa-devsh ostree[2481]: The --rebuild-if-modules-changed option is deprecated. Use --refresh instead.
[root@cosa-devsh ~]#
```
---

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index f27ae0e1..6222122b 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -2923,7 +2923,7 @@ sysroot_finalize_selinux_policy (int deployment_dfd, GError **error)
     return TRUE;
 
   /*
-   * Skip the SELinux policy refresh if the --rebuild-if-modules-changed
+   * Skip the SELinux policy refresh if the --refresh
    * flag is not supported by semodule.
    */
   static const gchar * const SEMODULE_HELP_ARGV[] = {
@@ -2935,14 +2935,14 @@ sysroot_finalize_selinux_policy (int deployment_dfd, GError **error)
     return FALSE;
   if (!g_spawn_check_exit_status (exit_status, error))
     return glnx_prefix_error (error, "failed to run semodule");
-  if (!strstr(stdout, "--rebuild-if-modules-changed"))
+  if (!strstr(stdout, "--refresh"))
     {
-      ot_journal_print (LOG_INFO, "semodule does not have --rebuild-if-modules-changed");
+      ot_journal_print (LOG_INFO, "semodule does not have --refresh");
       return TRUE;
     }
 
   static const gchar * const SEMODULE_REBUILD_ARGV[] = {
-    "semodule", "-N", "--rebuild-if-modules-changed"
+    "semodule", "-N", "--refresh"
   };
   static const gsize SEMODULE_REBUILD_ARGC = sizeof (SEMODULE_REBUILD_ARGV) / sizeof (*SEMODULE_REBUILD_ARGV);